tests: Remove outdated tests
authorBenjamin Otte <otte@redhat.com>
Sun, 20 Nov 2016 07:29:21 +0000 (08:29 +0100)
committerBenjamin Otte <otte@redhat.com>
Sun, 20 Nov 2016 07:33:13 +0000 (08:33 +0100)
The tests read a nonexisting colorprofile, try to convert stuff read
from the window into it, do things that gdk-pixbuf should test and
then aren't even integrated into the testuite.

Sheesh.

tests/Makefile.am
tests/testpixbuf-color.c [deleted file]
tests/testpixbuf-save.c [deleted file]

index 0d15d28396066eafd138a31cd3662959c8677fa7..064f093ec464a64d6fcd9170d49c26ab48e72e1e 100644 (file)
@@ -140,8 +140,6 @@ noinst_PROGRAMS =  $(TEST_PROGS)    \
        testsensitive                   \
        testtextview                    \
        testanimation                   \
-       testpixbuf-save                 \
-       testpixbuf-color                \
        testpixbuf-scale                \
        testgmenu                       \
        testlogout                      \
@@ -261,8 +259,6 @@ testtreepos_DEPENDENCIES = $(TEST_DEPS)
 testsensitive_DEPENDENCIES = $(TEST_DEPS)
 testtextview_DEPENDENCIES = $(TEST_DEPS)
 testanimation_DEPENDENCIES = $(TEST_DEPS)
-testpixbuf_save_DEPENDENCIES = $(TEST_DEPS)
-testpixbuf_color_DEPENDENCIES = $(TEST_DEPS)
 testpixbuf_scale_DEPENDENCIES = $(TEST_DEPS)
 testgmenu_DEPENDENCIES = $(TEST_DEPS)
 testlogout_DEPENDENCIES = $(TEST_DEPS)
@@ -436,10 +432,6 @@ testanimation_SOURCES = testanimation.c
 
 testpixbuf_scale_SOURCES = testpixbuf-scale.c
 
-testpixbuf_color_SOURCES = testpixbuf-color.c
-
-testpixbuf_save_SOURCES = testpixbuf-save.c
-
 testcolorchooser_SOURCES = testcolorchooser.c
 
 testcolorchooser2_SOURCES = testcolorchooser2.c
diff --git a/tests/testpixbuf-color.c b/tests/testpixbuf-color.c
deleted file mode 100644 (file)
index 3f762e6..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
-#include "config.h"
-#include <stdio.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-#define ICC_PROFILE             "/usr/share/color/icc/bluish.icc"
-#define ICC_PROFILE_SIZE        3966
-
-static gboolean
-save_image_png (const gchar *filename, GdkPixbuf *pixbuf, GError **error)
-{
-       gchar *contents = NULL;
-       gchar *contents_encode = NULL;
-       gsize length;
-       gboolean ret;
-       gint len;
-
-       /* get icc file */
-       ret = g_file_get_contents (ICC_PROFILE, &contents, &length, error);
-       if (!ret)
-               goto out;
-       contents_encode = g_base64_encode ((const guchar *) contents, length);
-       ret = gdk_pixbuf_save (pixbuf, filename, "png", error,
-                              "tEXt::Software", "Hello my name is dave",
-                              "icc-profile", contents_encode,
-                              NULL);
-       len = strlen (contents_encode);
-       g_debug ("ICC profile was %i bytes", len);
-out:
-       g_free (contents);
-       g_free (contents_encode);
-       return ret;
-}
-
-static gboolean
-save_image_tiff (const gchar *filename, GdkPixbuf *pixbuf, GError **error)
-{
-       gchar *contents = NULL;
-       gchar *contents_encode = NULL;
-       gsize length;
-       gboolean ret;
-       gint len;
-
-       /* get icc file */
-       ret = g_file_get_contents (ICC_PROFILE, &contents, &length, error);
-       if (!ret)
-               goto out;
-       contents_encode = g_base64_encode ((const guchar *) contents, length);
-       ret = gdk_pixbuf_save (pixbuf, filename, "tiff", error,
-                              "icc-profile", contents_encode,
-                              NULL);
-       len = strlen (contents_encode);
-       g_debug ("ICC profile was %i bytes", len);
-out:
-       g_free (contents);
-       g_free (contents_encode);
-       return ret;
-}
-
-static gboolean
-save_image_verify (const gchar *filename, GError **error)
-{
-       gboolean ret = FALSE;
-       GdkPixbuf *pixbuf = NULL;
-       const gchar *option;
-       gchar *icc_profile = NULL;
-       gsize len = 0;
-
-       /* load */
-       pixbuf = gdk_pixbuf_new_from_file (filename, error);
-       if (pixbuf == NULL)
-               goto out;
-
-       /* check values */
-       option = gdk_pixbuf_get_option (pixbuf, "icc-profile");
-       if (option == NULL) {
-               *error = g_error_new (1, 0, "no profile set");
-               goto out;
-       }
-
-       /* decode base64 */
-       icc_profile = (gchar *) g_base64_decode (option, &len);
-       if (len != ICC_PROFILE_SIZE) {
-               *error = g_error_new (1, 0,
-                                     "profile length invalid, got %" G_GSIZE_FORMAT,
-                                     len);
-               g_file_set_contents ("error.icc", icc_profile, len, NULL);
-               goto out;
-       }
-
-       /* success */
-       ret = TRUE;
-out:
-       if (pixbuf != NULL)
-               g_object_unref (pixbuf);
-       g_free (icc_profile);
-       return ret;
-}
-
-int
-main (int argc, char **argv)
-{
-       GdkWindow *root;
-       GdkPixbuf *pixbuf;
-       gboolean ret;
-       gint retval = 1;
-       GError *error = NULL;
-
-       gtk_init (&argc, &argv);
-
-       root = gdk_get_default_root_window ();
-       pixbuf = gdk_pixbuf_get_from_window (root,
-                                            0, 0, 150, 160);
-
-       /* PASS */
-       g_debug ("try to save PNG with a profile");
-       ret = save_image_png ("icc-profile.png", pixbuf, &error);
-       if (!ret) {
-               g_warning ("FAILED: did not save image: %s", error->message);
-               g_error_free (error);
-               goto out;
-       }
-
-       /* PASS */
-       g_debug ("try to save TIFF with a profile");
-       ret = save_image_tiff ("icc-profile.tiff", pixbuf, &error);
-       if (!ret) {
-               g_warning ("FAILED: did not save image: %s", error->message);
-               g_error_free (error);
-               goto out;
-       }
-
-       /* PASS */
-       g_debug ("try to load PNG and get color attributes");
-       ret = save_image_verify ("icc-profile.png", &error);
-       if (!ret) {
-               g_warning ("FAILED: did not load image: %s", error->message);
-               g_error_free (error);
-               goto out;
-       }
-
-       /* PASS */
-       g_debug ("try to load TIFF and get color attributes");
-       ret = save_image_verify ("icc-profile.tiff", &error);
-       if (!ret) {
-               g_warning ("FAILED: did not load image: %s", error->message);
-               g_error_free (error);
-               goto out;
-       }
-
-       /* success */
-       retval = 0;
-       g_debug ("ALL OKAY!");
-out:
-       return retval;
-}
diff --git a/tests/testpixbuf-save.c b/tests/testpixbuf-save.c
deleted file mode 100644 (file)
index af51e5d..0000000
+++ /dev/null
@@ -1,391 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
-#include "config.h"
-#include <stdio.h>
-
-#include <gtk/gtk.h>
-
-static void
-compare_pixbufs (GdkPixbuf *pixbuf, GdkPixbuf *compare, const gchar *file_type)
-{
-        if ((gdk_pixbuf_get_width (pixbuf) !=
-             gdk_pixbuf_get_width (compare)) ||
-            (gdk_pixbuf_get_height (pixbuf) !=
-             gdk_pixbuf_get_height (compare)) ||
-            (gdk_pixbuf_get_n_channels (pixbuf) !=
-             gdk_pixbuf_get_n_channels (compare)) ||
-            (gdk_pixbuf_get_has_alpha (pixbuf) !=
-             gdk_pixbuf_get_has_alpha (compare)) ||
-            (gdk_pixbuf_get_bits_per_sample (pixbuf) !=
-             gdk_pixbuf_get_bits_per_sample (compare))) {
-                fprintf (stderr,
-                         "saved %s file differs from copy in memory\n",
-                         file_type);
-        } else {
-                guchar *orig_pixels;
-                guchar *compare_pixels;
-                gint    orig_rowstride;
-                gint    compare_rowstride;
-                gint    width;
-                gint    height;
-                gint    bytes_per_pixel;
-                gint    x, y;
-                guchar *p1, *p2;
-                gint    count = 0;
-
-                orig_pixels = gdk_pixbuf_get_pixels (pixbuf);
-                compare_pixels = gdk_pixbuf_get_pixels (compare);
-
-                orig_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-                compare_rowstride = gdk_pixbuf_get_rowstride (compare);
-
-                width = gdk_pixbuf_get_width (pixbuf);
-                height = gdk_pixbuf_get_height (pixbuf);
-
-                /*  well...  */
-                bytes_per_pixel = gdk_pixbuf_get_n_channels (pixbuf);
-
-                p1 = orig_pixels;
-                p2 = compare_pixels;
-
-                for (y = 0; y < height; y++) {
-                        for (x = 0; x < width * bytes_per_pixel; x++)
-                                count += (*p1++ != *p2++);
-
-                        orig_pixels += orig_rowstride;
-                        compare_pixels += compare_rowstride;
-
-                        p1 = orig_pixels;
-                        p2 = compare_pixels;
-                }
-
-                if (count > 0) {
-                        fprintf (stderr,
-                                 "saved %s file differs from copy in memory\n",
-                                 file_type);
-                }
-        }
-}
-
-static gboolean
-save_to_loader (const gchar *buf, gsize count, GError **err, gpointer data)
-{
-        GdkPixbufLoader *loader = data;
-
-        return gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err);
-}
-
-static GdkPixbuf *
-buffer_to_pixbuf (const gchar *buf, gsize count, GError **err)
-{
-        GdkPixbufLoader *loader;
-        GdkPixbuf *pixbuf;
-
-        loader = gdk_pixbuf_loader_new ();
-        if (gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err) &&
-            gdk_pixbuf_loader_close (loader, err)) {
-                pixbuf = g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader));
-                g_object_unref (loader);
-                return pixbuf;
-        } else {
-                return NULL;
-        }
-}
-
-static void
-do_compare (GdkPixbuf *pixbuf, GdkPixbuf *compare, GError *err)
-{
-        if (compare == NULL) {
-                fprintf (stderr, "%s", err->message);
-                g_error_free (err);
-        } else {
-                compare_pixbufs (pixbuf, compare, "jpeg");
-                g_object_unref (compare);
-        }
-}
-
-static void
-keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
-{
-        GdkPixbuf *pixbuf;
-        GtkDrawingArea *da = (GtkDrawingArea*)data;
-        GError *err = NULL;
-        gchar *buffer;
-        gsize count;
-        GdkPixbufLoader *loader;
-
-        pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (da), "pixbuf");
-
-        if (evt->keyval == 'q')
-                gtk_main_quit ();
-
-        if (evt->keyval == 's' && (evt->state & GDK_CONTROL_MASK)) {
-                /* save to callback */
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                }      
-
-                loader = gdk_pixbuf_loader_new ();
-                if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "jpeg",
-                                                  &err,
-                                                  "quality", "100",
-                                                  NULL) ||
-                    !gdk_pixbuf_loader_close (loader, &err)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
-                                    err);
-                        g_object_unref (loader);
-                }
-        }
-        else if (evt->keyval == 'S') {
-                /* save to buffer */
-                if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "jpeg",
-                                                &err,
-                                                "quality", "100",
-                                                NULL)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    buffer_to_pixbuf (buffer, count, &err),
-                                    err);
-                }
-        }
-        else if (evt->keyval == 's') {
-                /* save normally */
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                }      
-
-                if (!gdk_pixbuf_save (pixbuf, "foo.jpg", "jpeg",
-                                      &err,
-                                      "quality", "100",
-                                      NULL)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    gdk_pixbuf_new_from_file ("foo.jpg", &err),
-                                    err);
-                }
-        }
-
-        if (evt->keyval == 'p' && (evt->state & GDK_CONTROL_MASK)) {
-                /* save to callback */
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                }
-
-                loader = gdk_pixbuf_loader_new ();
-                if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "png",
-                                                  &err,
-                                                  "tEXt::Software", "testpixbuf-save",
-                                                  NULL)
-                    || !gdk_pixbuf_loader_close (loader, &err)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
-                                    err);
-                        g_object_unref (loader);
-                }
-        }
-        else if (evt->keyval == 'P') {
-                /* save to buffer */
-                if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "png",
-                                                &err,
-                                                "tEXt::Software", "testpixbuf-save",
-                                                NULL)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    buffer_to_pixbuf (buffer, count, &err),
-                                    err);
-                }
-        }
-        else if (evt->keyval == 'p') {
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                }
-
-                if (!gdk_pixbuf_save (pixbuf, "foo.png", "png", 
-                                      &err,
-                                      "tEXt::Software", "testpixbuf-save",
-                                      NULL)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare(pixbuf,
-                                   gdk_pixbuf_new_from_file ("foo.png", &err),
-                                   err);
-                }
-        }
-
-        if (evt->keyval == 'i' && (evt->state & GDK_CONTROL_MASK)) {
-                /* save to callback */
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                }
-
-                loader = gdk_pixbuf_loader_new ();
-                if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "ico",
-                                                  &err,
-                                                  NULL)
-                    || !gdk_pixbuf_loader_close (loader, &err)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
-                                    err);
-                        g_object_unref (loader);
-                }
-        }
-        else if (evt->keyval == 'I') {
-                /* save to buffer */
-                if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "ico",
-                                                &err,
-                                                NULL)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare (pixbuf,
-                                    buffer_to_pixbuf (buffer, count, &err),
-                                    err);
-                }
-        }
-        else if (evt->keyval == 'i') {
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                }
-
-                if (!gdk_pixbuf_save (pixbuf, "foo.ico", "ico", 
-                                      &err,
-                                      NULL)) {
-                        fprintf (stderr, "%s", err->message);
-                        g_error_free (err);
-                } else {
-                        do_compare(pixbuf,
-                                   gdk_pixbuf_new_from_file ("foo.ico", &err),
-                                   err);
-                }
-        }
-
-        if (evt->keyval == 'a') {
-                if (pixbuf == NULL) {
-                        fprintf (stderr, "PIXBUF NULL\n");
-                        return;
-                } else {
-                        GdkPixbuf *alpha_buf;
-
-                        alpha_buf = gdk_pixbuf_add_alpha (pixbuf,
-                                                          FALSE, 0, 0, 0);
-
-                        g_object_set_data_full (G_OBJECT (da),
-                                                "pixbuf", alpha_buf,
-                                                (GDestroyNotify) g_object_unref);
-                }
-        }
-}
-
-
-static int
-close_app (GtkWidget *widget, gpointer data)
-{
-        gtk_main_quit ();
-        return TRUE;
-}
-
-static void
-draw_func (GtkDrawingArea *darea,
-           cairo_t        *cr,
-           int             width,
-           int             height,
-           gpointer        data)
-{
-        GdkPixbuf *pixbuf;
-         
-        pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (darea),
-                                                 "pixbuf");
-
-        gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
-        cairo_paint (cr);
-}
-
-static int
-configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
-{
-        GdkPixbuf *pixbuf;
-                           
-        pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area),   
-                                                 "pixbuf");
-    
-        g_print ("X:%d Y:%d\n", evt->width, evt->height);
-        if (evt->width != gdk_pixbuf_get_width (pixbuf) || evt->height != gdk_pixbuf_get_height (pixbuf)) {
-                GdkWindow *root;
-                GdkPixbuf *new_pixbuf;
-
-                root = gdk_get_default_root_window ();
-                new_pixbuf = gdk_pixbuf_get_from_window (root,
-                                                         0, 0, evt->width, evt->height);
-                g_object_set_data_full (G_OBJECT (drawing_area), "pixbuf", new_pixbuf,
-                                        (GDestroyNotify) g_object_unref);
-        }
-
-        return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{   
-        GdkWindow     *root;
-        GtkWidget     *window;
-        GtkWidget     *vbox;
-        GtkWidget     *drawing_area;
-        GdkPixbuf     *pixbuf;    
-   
-        gtk_init (&argc, &argv);   
-
-        root = gdk_get_default_root_window ();
-        pixbuf = gdk_pixbuf_get_from_window (root,
-                                             0, 0, 150, 160);
-   
-        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-        g_signal_connect (window, "delete_event",
-                         G_CALLBACK (close_app), NULL);
-        g_signal_connect (window, "destroy",   
-                         G_CALLBACK (close_app), NULL);
-   
-        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-        gtk_container_add (GTK_CONTAINER (window), vbox);  
-   
-        drawing_area = gtk_drawing_area_new ();
-        gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (drawing_area),
-                                            gdk_pixbuf_get_width (pixbuf));
-        gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (drawing_area),
-                                             gdk_pixbuf_get_height (pixbuf));
-        gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (drawing_area), draw_func, NULL, NULL);
-
-        g_signal_connect (drawing_area, "configure_event",
-                         G_CALLBACK (configure_cb), NULL);
-        g_signal_connect (window, "key_press_event",
-                         G_CALLBACK (keypress_check), drawing_area);
-        g_object_set_data_full (G_OBJECT (drawing_area), "pixbuf", pixbuf,
-                                (GDestroyNotify) g_object_unref);
-        gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE);
-
-        gtk_widget_show_all (window);
-        gtk_main ();
-        return 0;
-}